From: Glenn Morris Date: Wed, 28 Aug 2013 23:32:25 +0000 (-0400) Subject: * lisp/progmodes/antlr-mode.el: No need to require cc-mode twice. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3275^2~68 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=397440a1b6521d0dc60ee2abd97f5eed22020dab;p=emacs.git * lisp/progmodes/antlr-mode.el: No need to require cc-mode twice. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 47f6d7a5665..616f9044f78 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2013-08-28 Glenn Morris + * progmodes/antlr-mode.el: No need to require cc-mode twice. + * progmodes/cc-bytecomp.el (cc-require): Handle uncompiled case. * progmodes/cc-mode.el (c-define-abbrev-table): Handle NAME unbound. diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el index 56680f23a8e..bf90db54002 100644 --- a/lisp/progmodes/antlr-mode.el +++ b/lisp/progmodes/antlr-mode.el @@ -178,10 +178,6 @@ (set-buffer-modified-p nil))))))) (put 'save-buffer-state-x 'lisp-indent-function 0) -;; get rid of byte-compile warnings -(eval-when-compile - (require 'cc-mode)) - (defvar outline-level) (defvar imenu-use-markers) (defvar imenu-create-index-function)